Merge branch 'matthiasc/for-master' into 'master'
authorMatthias Clasen <mclasen@redhat.com>
Fri, 1 Jan 2021 22:48:11 +0000 (22:48 +0000)
committerMatthias Clasen <mclasen@redhat.com>
Fri, 1 Jan 2021 22:48:11 +0000 (22:48 +0000)
Matthiasc/for master

Closes #3506 and #3530

See merge request GNOME/gtk!3024


Trivial merge